import bugfixes from trunk: [11164] [11165] [11167] [11169] [11172] [11176] [11177] [11178] [11179] [11181] [11182] [11183] [11184] [11188] [11189] [11191] [11192] [11193] [11194] [11195] [11196] [11212] [11213] [11215] [11217] [11219] [11220] [11222] [11224] [11226] [11227] [11232] [11233] [11235]

Fixes #4702 #4891 #4880 #4913 #4582 #4888 #4884 #4938 #4948 #4950 #4938 #4937 #4936 #3597 #4852 #4867 #4957 #4685 #4746 #4964 #4978 #4977 #4727