Merge "Fix issues with metadata handling when format change happens"