Updated issues.
Merge branch 'master' into issue/MOSS-bugs