[KFSQA-681] changes made based on crucible KFSQA-14 review comments.