SS-612 Pulled some updates from upstream.

@nayao please give your holy blessing.