Imported Upstream version 1.0.4j
Merge tag 'upstream/1.0.4j'

Upstream version 1.0.4j
Bump.