Merge remote-tracking branch 'Zoxc/stmesg'