merge 18/4