ISPN-2766 Fix merge