Sync to version 0.5.99