SOS-2442-master

Sorry, I somehow completetly missed this.