merge 6.0 policy engine changes into master