Manual merging of changes from ba02782d94655e56c84f83ddb066e6e2f4a43134