added 'addHints' config var
fix merge