Merge remote-tracking branch 'origin/kel/astv2' into ncb/development
Missing type check error for constructor returns, fixes #261
Merge commit 'bb98b561eb8087ad1181b015a206ddb42732c61f' into development