merge kisskys/master_logrecord_optimization into master