merge of recent ASAP enhancements from 4_4
Authored by: jacks 2007-08-13
Parent: [r11229]
Child: [r11231]