merge of '3524b1de858df7cc6c88667817fb70332cf4b03e'