merge of '4876e130f4dda342390929a72c2c452dfa33d3ac'