merged from master to kisskys/master_fix_issue_510