alarm/v8-3.16 to 3.16.8.1-2, fixes #729