Final Services API fixes for 1.20.0 release.