v5.0.5.0 and v5.0.6.0
Merge branch 'v5.0.5.0'