Backporting A15 changes