These changes have been also sent back to LBL for inclusion in next release. Submitted by: Tony Li <tli@jnx.com>