Merge of 6+ months of changes to upstream
There are many changes in this repository that might need to be merged into upstream. I'm not the author of many (if any) and I'm wondering how to proceed to do OPI work for BPM as of today. There are also two additional branches on this repo that seem to be BPM and FC related.
Can ICS figure out how these changes should be merged so that we have aligned repos, please?