merge 7.0.3