Fake to ZeroBranch in SA template
refactoring in Beauti templates