[Minor] High-level changes to scripts, forking, policies etc.