Merge branch 'JOSHUA-327'