update 18-12
update 18-12 merge