rebased version of !407 (merged)
Original merge request was merged. This one was just for testing. Closing
closed