1. Connswater area fixes

    Closed
    #176091812 15 9 11 0