r22173: BUG 4491, 4501: Additional fixes for protecting against