merge of '26da1e390ef5f5b958b6660965006568272d8f67'