3 Commits (CLDC-1530-working-situation)