merge of '4dfc2a473c46128476f166a00ad2fae6fdd1d9cd'