2 Commits (CLDC-1750-po-fixes)