Merge remote-tracking branch 'remotes/nickv/ticket/10411-2' into develop