shared station demo cleanup
Merge remote-tracking branch 'origin/master'
add test for PM rebase()