REVIEW-3764: Update to release notes. Simplified logic and added more tests.