Changes for 6.5 a patch DO-5370,DO-5369,DO-5437,DO-5436