Merge with origin/development. Small improvement to the semantics rules of formula script.
Merge remote-tracking branch 'origin/kel/base' into acf
Refactorings in imports and in generation of guards.