Merge branch 'cleanup_prot_header_file' into 'main'

prot_fx1.h and prot_fx2.h replaced with single prot_fx.h

See merge request !456