website: Merge develop branch into stable

Change-Id: Iee2cf83c353decdfc9c37b698e045fa352cc56f3