merge of '017fd59a29d14dbd3c9a86e2bccaadc64909892a'