Merge branch 'doc/auto-enable-api'