Merge branch 'dsminer-upscaled'