APi-CHANGES: changes from 796f472