Merge "Streamline accessibility flow"