Update
Update
Update
Update
Update
Merge branch '0.5.12-dev' into 0.5.12
Update