PB-712, PB-710 fixed.
Merge commit '7311c6862b495342cbb8a48885498b588f314c68' into HEAD