Merged A2 Support pull