Merge branch 'maint' into ph/checkout