flax

f8c70d67 - Merge changes from jheek's functional-core branch.