Updating project target api.
Making some changes on topic branch.
Addressing PR comments.
Looks like I need to merge after the rebase to master to be able to push to ch33-tosunvm to complete the pull request.