Merge "Fix performance degradation from BootSequence atom"