code improvements
Merge origin/v3.0-development into v3.0-development