Merge "Mandate the /metadata to be early mounted" into qt-dev