Update preparation for git-cache use
Merge branch 'sf/preparation' into sf/int