Merge "Fix policy status issue"