Merge branch 'integration/master' into admin-page