merger master with rarflix - patched