Merge "Clean-up after custom permission being added to kb" into rvc-qpr-dev