Merge branch 'jg/prompt-localize-temporary'