PATCH I 3.960 ready to ship

Fixes #227, #229, #230, #231, #232 and #236