ESC # 500980

Sent fix to field on 5/12;
Sources checked into local tree;
Still need to perfrom "putback" to main tree.
