merge setting latest from master