Sync with indev branch, bump version to 0.4.7