Updates for 5.0.5 release

(cherry picked from commit 8e37210b22f178368d13a704d62b85c1a4233324)