website: Merge branch stable branch into develop

Change-Id: I624e77d68c4e55e6501b34d4dd73602ee74bc15a