merge dev files 3.0.5