Merge Fix for Glassfish-21175