merge of '1e83baccab5ff8f9286b326ca23932f59ccea5b0'