Manually merged new_fibrations with master (branches are left separated)