Merge "Add the frontend into the final package"