fix wrong merge of 'master' to '2.1.x' (d20ab76b3bbda0484aa7871b9de20910e32db097)