Merge CHANGES from 0-15-stable