Merge "Revert submission 1191937-art_apex_available"