Addional hot fixes to fix potential infinite loops
Applied changes for DMZ RMS Server