2407 Commits (CLDC-2585-mandatory)