Merge "Alternative activity policy exemption API" into main