U4-4928 - issue with missing media content properties
Merge remote-tracking branch 'origin/6.2.1' into 6.2.1
U4-4931 - fixing & refactoring