Moved git_suffix to baselib
Merge