Merge in changes from fps head. Highlights: