Merge Fix for GLASSFISH-21007