Merge "Don't throw exception for duplicate resume" into pi-dev