closed #1211 closed #1159 closed #1092