covered convertible but non-copyable classes
Merge branch 'develop'