Merge in fix for Glassfish-21175