RR 2.3.6a-BETA hotfix

Why hello there rushjob, how are you?