Merge branch 'as/maint-expire'