4.1.1 update from 4.0.3