Backport systools branch learnings