Merge branch 'topic/vmaster-update' into topic/docbook-fix