Fixed bug #68009

the progress handler fired while in the mid of executor shutdown
Fix bug #68000 	Extension does not build on FreeBSD
Merge branch 'R_2_1'