This branch should be the feature branch for BTN-1544 and each sub-task should be developed in a branch based off of this one and merged in here rather than to master