Merge "Bump pap to 2.4.2-SNAPSHOT"