Fix #672
StackVector fix
Fixes #688
Merge branch 'master' into issues_L