Fix for override Check Policies in agent
(cherry picked from commit 0001050)