minor bugs about activity behaviour
Merge branch 'slave'