CFK-141
Merge branch 'feature/CFK-141' into feature/culturefeed_entry_ui