Merge "Fixes in current code for Multi-UE support [Issue-ID: ODUHIGH-354]"