Merge branch 'master' into test

# Conflicts:
#	device-api-service/src/main/java/com/xy/service/DeviceChargingServiceImpl.java