JBIDE-14979 more updates to ensure all use cases work