addressed pull 121 comments for BUGR-11213