Merge admin\controller\design with 1.5.5.1