Merge "Add more parameters to alarm-gen config"