Roni | BSHR-312 | Nested if merged