Apply fixes for PA3