hotfixes, tasks and activities

hotfixes, tasks and activities