Merge "Add internal API for note iteration"