Changes for Issue#239 from 1.0-MAINT