added back get_diff
Merge branch 'rel/chiba2' of github.com:novius-os/core into rel/chiba2