Updated for release fro CB 1.6.4 R2.0