SOS-1598 Fix displayImmediately for 6.1.x
SOS-1598 Source formatting