Merge "Fix resource-loading code for TransitionSet" into klp-dev