Export function correction
Merge remote-tracking branch 'origin' into mqtt