SOS-2442-master

7.0 only. Front end for 7.0 is going to diverge from 6.2