Commits in hsdiffusion/mainline:master