*8148* bring over policy from OMP
*8148* refactor base handler class to use renamed policy