3.36: Add elements to make possible to compare ABI afterwards
This is needed to be merged first to make !574 (closed) work properly
Part of #262
Edited by Javier Jardón
This is needed to be merged first to make !574 (closed) work properly
Part of #262