Merge branch 'CoryChaplin-fix_380' into development