Merge branch 'fix/noop-policy-describe' into 'develop'