merge of '597405ebde19640675e0298f9206b90ef981a115'