Merge branch '2195_basop_portFlp2358_AmbiConvert' into 'main'

Port Flp MR 2358 to main - Makefiles: Add "ambi_converter" to default build targets

Closes #2195

See merge request !2527