Merge "Transition: fix NPE problem." into main