Custom KQI creation

From C-7KDB897