Transformation: export additional functions
merge: restore functions
merge: change the order of inputs reading
merge: macro before function specs parsing fix
Merge branch 'devel' into merge-refactoring

Conflicts:
	merge