RAZ-2885: merge