Merge "Fix issue for policies not loading on GUI push tab"