Merge "Fix to do not remove entity inside loop.(Transition)" into devel/master