Merge branch 'jc/am-3-nonstandard-popt' into maint