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

[TIMOB-13678] Each block in its own begin/end section