First cherry pick merge of ISO_C_BINDINGS, does not compile yet
Working towards first succesful build
Merge branch 'devel', remote branch 'origin/devel' into devel