Done: Big merge with upstream master prepared.