Just updating the comments, no code changes from v2_3 yet.