WIP: Metadata format reboot
WIP: Metadata format reboot, view/save meta fix
Update from master