Merge "Speed up dev options"