Merge pull request #5404 from sivel/rax-improvements

rax module: improvements