Removed and extra check that was never going to be false
Merge branch 'develop' into feature/13
Merge branch 'feature/13' into develop