Merging latest FOF development branch