Updated Merge which addresses Glassfish-21175