Merge branch 'cx25-ht49' into 'master'

Add cx25-ht49 FP

See merge request !64
3 jobs for master in 35 seconds (queued for 1 second)