Merge branch 'on-waves/stp'