Merge develop for 3.0.5