LP#1402797 Separate stock and custom penalty type models