Merge pull request #11679 from ctzsnooze/AGV4