extends btw alignment for not-xs
Merge commit 'c5a9570d35ce7f185c087cc59e73072751379652'