Cherry-pick 'Resolve "Code clean up"' into release/0.15

Original MR: !69 (merged)

Merge request reports

Loading