[Olena-patches] [PATCH 25/31] Add some code to extend the work of Etienne and Fred.