Port updated to 1.1.2_1