Please try to apply it to your codebase and confirm so that necessary changes can be done on CVS as well.
Miguel,
Ignore this part. I initially thought it would require intrusive change. It was a backwards compatible 3 liner so I went ahead and did the commit so you can already update and just worry about #1.