APi-CHANGES: changes from 07bbbe0