Spring 4x integration

Bill,
sorry there are other commits which are already in previous PR.
If it is problem, I have to redo it tomorrow.
I have to run