Merge branch 'alexandre/at-various-fixes' into wip