Improved network service switching

bnc#868256