Update unionfs_init branch