Merge develop into hotfix/jamison, commenting out background change