Merge remote branch 'galen/bug5308' into bug_5308