Merge "Hook southbound integration in normal build process"