Importing v1.5
Merge (--strategy=ours) branch 'old'