completed updated from Feature1521 branch of 2.1.7 [5986:c3e1c72584ad]