added new function
cherry picked bug fix
squashed bugfix01
conflict resolved