#TPA-1237|Resolved