Pull request for IRM-397