Finished solution for target 4.
Merge branch 'master' into bbrouse_target4