Merge branch 'options-global-pollution' into dev