Merge remote-tracking branch 'origin/feature/VOV-1776' into feature/vov-1649