merge ticket:6 to master