Merge "Transition support library"