acu112285 - revert changes 9dabb7e72b - 913aa82c74 from master and placed in differnt branch for reviewing