Merge "Fixed failing CTS ConfigTest on KLP" into klp-dev