Merge changes from topic "K-1"

* changes:
  Merge this if statement with the enclosing one
  Remove useless curly braces around statement
  Merge this if statement with the enclosing one.