Branch master synchronized with JPI.