[user-guide] Merge branches 'master' and 'f17'