merge of v4.0.1