sync svn r23693 - [ZF-11002] ehancement implemented as proposed - Omitted attributes get retrieved then forgotten
Merge branch 'hotfix/4418'

Close #4418
Merge pull request #4420 from sasezaki/hotfix/ZF-11002

sync svn r23693 - [ZF-11002] ehancement implemented as proposed
Merge branch 'hotfix/4420' into develop

Forward port #4420