Merge branch 'lt/fix-apply' into maint