Skallesh

Incorporated review comments,also added coverage for the bug 1175284