Merge pull request #917 from birarda/assignment

handle AC and DS on same network using global AS