merge of '5238e30c679ed4c9836291822577cc8cf6d35993'