fix decimal, integer alias overtype behavior wit autogroup disabled
Merge branch '1.x' into 2.x