Merge "Add hpa module"