re-include old upgrade steps and introduce new for profile version 2