Merge of changes e602d38f7b2991499180fc3f1cb38652acd49f27 and e27fd3e15a53424e8674600e1d4bcdeb98788266 from master.