merge controller util module from master branch