Merge branches 'topic/fixes', 'topic/cleanups' and 'topic/documentation' into for...