Merge branch 'sh/alphaproject' into sh-latest