Merge "Apply policy/models native drools policies changes"