merge of 'c038e0efea1f81ad9c7092f84a3bd377a19e712b'