SOS-2156 Refactor to be compatible with 6120+
SOS-2156 SF