Merged changes from activity branch