fix merge issue while BS-10870 conflicts with master update