Merge branch 'sandbox/knimitz/layer_with_pm_tmp' into sandbox/knimitz/layer_with_pm