Merge "Exception in SubnetRoute Feature"