Merge "Core-nssmf - activate/deactivate flow"