[All] Move all the shared options upstream