[master] Fix metadata import