merged latest from Stefan