Merge "Recreate activity with correct configuration" into nyc-dev