work-in-progress: Feature/ffn

merging in-progress feature branch 'ffn' back into develop.