Fixing the creation of new activities
Merge commit '97763fcbf4ac9a6c5f898d30d3bd73388023b5c7'