Implement changes from Telco on 28 Nov