merge of 'c6c228c0cd2991434c9bb9e2a46ea7de66af8962'