Merge "Design documentation" into stable-2.16