Merge remote-tracking branch 'origin/pvj/main' into ncb/development
Problem converting composed function values, fixes #394
Merge remote-tracking branch 'origin/ncb/development' into jwc/base