Merge "Better Transition interruption" into klp-dev