2.04.0:zeress:149 Partial for Issue #134