Merge OHAI-542, OHAI-550, OHAI-551, OHAI-554, OHAI-557 into 7-stable