Rebased merge branch for pull request

Rebased SAV MkI branch for pull request.