Merge branch 'release/3.0.0'
Merge branch 'release/3.0.4'
Fix for blank trailing values
Merge branch 'hotfix/3.0.5' into develop