Merge "Code changes for OOF SON Use Case"