Merge branch 'core_sw_pre_dec_fxd' into 'main'

Add conversion changes for core_switching_pre_dec, ism-funcs

See merge request !212