website: Merge branch 'stable' into develop

Change-Id: I9ae6914a9d05f98954c683fa680f5f00aa09102f