Merging Projects branch

See Pivotal Tracker for epic Project https://www.pivotaltracker.com/s/projects/982890