Merge "Fix regression where promptReason would dissapear"