Revised xrLuaFix originally authored by RVP

Слиты xottab-duty запросил слияние xrLuaFix в dev

Created by: Xottab-DUTY

Closes #998 Closes #999 Closes #1000