Merge "Fix sonar issue about nested stmts"