Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev