merge 4.1b with 4.1c