merge latest ffn and statistic changes