propagate changes to histplotter from AM-dev