Merge branch 'release/3.0.8'
Merge tag '3.0.8' into develop

Version 3.0.8