merge of '8b788877676745843159ccb616b8159259af90f9'