PLF-5629: Data upgrade in Platform-4.0.5
Merge commit '86120eff2dba807492099c58be14e02aa5963a96' into HEAD