Changes in old ficl-5 branch merged in.