Merge "refactoring metal3 code"