Closes SD-148
BE !488
The title pretty much sums up this MR. But we should test on dev before merging to make sure that it's working as intended.