Should now be working properly.
Merge branch 'VictorFeatureBranch' into develop