Merge branch '1.6.4'
Updated some if clauses
Removed an empty statement
Merge branch 'master' into 1.6.4