some fixes for numeric (still some issue when deleting)
Merge branch '1.x' into 2.x