Web sites updates for release on May 8 - #1260