merge of '07a342693675fe2b1daacf0eb62302579d9fade3'