fix wrong merge of 'master' to '2.1.x'