merge /burn from @tonibm19 into the plugin