Merge 3.0.5 in master