Merge "Fix copy constructor" into jb-mr2-dev