#660 added changes which were made during a merge to resolved