Merge remote-tracking branch 'origin/feature/stan-issue-109' into develop