Merge branch 'ib/scripted-parse-opt-better-hint-string' into maint