Merge "User activation > app deactivation" into main