RSRP-284219
#RSRP-287110 fixed
Fixed pending changes in option page