Sync w/ ZTK trunk.
Synch w/ ZTK trunk.