Working on [KFSQA-667]
Continuing work [KFSQA-667]
Merge branch 'master' into KFSQA-667
Continuing work [KFSQA-667]
minor formatting tweaks [KFSQA-667]
Merge branch 'master' into KFSQA-667
cleanup [KFSQA-667]