Finished solution for target 6
Merge branch 'master' into bbrouse_target6