#TPA-1306|Resolved