Rax stage

Merge conflicts happened. Manual merge happened. Rest, as they say, is mysetery.