manually merged pull #861
manually merged pull #861 and moved tools to common controller