fix #1164 and introduce 2_11_1_pre2