Fix for issue with multiple device policies for the same action