[TIMOB-11267] More work on upgrading the prompt stuff.