Updated 1.2-stable branch to core 1.8.3