Merge release24 into develop

Plus a fix for an error I introduced.