Only build in fixsessionfactory branch