Merge "Fix nested stmts issue of Sonar"