[TIMOB-13678] Each block in its own begin/end section
Merge pull request #5496 from vishalduggal/timob-13678-32X

[TIMOB-13678] (3_2_X) Each block in its own begin/end section