Merge "Add boot flags for metadata query" into sc-dev