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