Merge cyberfox to beta tree