Added user activity support
Fixed conflicts and merged changes from andeplane