extend Util class
rename method to follow common naming pattern
remove unnecessary methods
clean up
Merge branch '4.2' into 4.3

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.