[ros-diffs] [janderwald] 43051: - Check if a shortcut to shortcut is made and resolve it in that case - Fixes bug 4720