Merge admin\controller\common with 1.5.5.1