Merge "Adapt to API constant changes" into klp-dev