Merge master
into features/pytorch-device
#683
Merged
master
into features/pytorch-device
#683