Merge "Maintain independent image version for M.C. plugin"