Fix initial propagation of PropRegular
Merge branch 'feature-reg' into develop