US912 - Resolution to claim note issue when leaving the application.
Merge remote-tracking branch 'origin/integration' into integration