tests for issue #663
Merge branch 'next' into sam_no_rsi