Fixed if-statement and commenting consistency
Merge branch 'master' into UF-137
Merge branch 'UF-137' into UF-139
Fixed one last if-statement consistency issue