Merge branch 'revert-4c5ffbce' into '2.7.1-dev'

Revert "SOL002_195 Alarm datatype, table 7.5.2.4-1 updated"

See merge request !13