PLA-1368

Review and Merge this PR only after #3315 is merged as most of the commits belong there