Closes TMSS-243 and other related tickets. Can treat this as baseline project and after merging, create master for front-end team.