merge changes of Util.js made by Ignite team