Silence IDE warning.
Merge topic 'policies' into next

22b43fd Silence IDE warning.