Merge "Revert "Enable merge of the versions struct of a plugin""