Merge "Fix issue with Guard policies"