Closes #4230 (closed)
Also added change from !1167 (merged)
Merge request pipeline #5459 passed
Merge request pipeline passed for 196513e5 4 years ago
Pipeline #5479 passed
Pipeline passed for eb3117a2 on develop 4 years ago