bug fixes: 2252, 2285, 2261, 2236, 2095, 2054, 2188, 2114, 1994, 1827