Merge branch 'amf/swt_fix' into sprint75