handleremove fix
#320 - enhance regex extension
Merge branch '2.x' into 2.6