Merge branches 'topic/documentation', 'topic/slub/fixes' and 'topic/urgent' into...