Oops, all commits in this branch are on the incorrect TMSS-2940 ticket. It should have been TMSS-2950.
Closes TMSS-2950