More to 3.0 branch.

Signed-off-by: crynobone <crynobone@gmail.com>