merged 4.0 into 4.1