add ticket
Merge branch 'master' into rel_1_0