10 Commits (CLDC-allow-23-24-form-new)