Merge "Remove support for legacy APIs." into klp-dev