CORE-4193: Updated util for convenience function