2.04.0:zeress:147 Partial for Issue #122