2 Commits (CLDC-1917-allow-23/24-form)