update to latest base
Merge pull request #1055 from hwhw/fix_1040

update to latest base