Merge pull request #12390 from evelynhung/issue-900399-v1-train-2

Issue 900399 v1 train (cherry picked from commit 2cae0622ee942906daaca90293441afdbd2cb7de)

Conflicts:

	build/applications-data.js