merging beta 5 branch