temporarily resolved issues from branching