merge from storedpolicy branch
Merge branch 'dev' into next