Merge "Fix custom restrictions launch mechanism" into klp-dev