Manually adding changes from following commit in the HEAD version:
fa14cb7e1d9c371bbb4f8111a8360fa3f30403d0
Manually adding changes from the following commit in the HEAD version:
d26ee473938c2191b614cf73845fddf0501b0d7b