AS7-6466 Update based on Mojarra 2.1.18