Actually made change for HJ :).
Merge branch 'optigraph' into wip-release
Merge branch 'master' into optigraph