Remove un-needed if statement
Merge remote-tracking branch 'origin/development' into 'feature/ajax'