Pick up changes from master to 2.065 branch

Most of recently merged website fixes should be released in 2.065.