2.03.1:zeress:14 Partial for Issue #58