Merge "Fix crash due to broken preconditions" into main