Merge branch 'lane/dspark-q38-recover'