JBIDE-17775 - Simplified version of PR #180