Merge branch 'JOSHUA-328'