Merge branch 'ra/anno' into next