Merge trunk changes (from r2196 up to 2259) into branch