Merge "Handling exception when per-use prompt cannot be generated" into tm-dev