Version 3.0.5

Change-Id: I562b6ded0541f55bbaa3117b26ba3d3ae5fae830