Merge "Check that modespecs are not null" into main