Merge branch 'rs/st-mult'