BUG:5116 add support for router-association