Merge "Fix for MDONS usecase SO-2967"