RTBKIT-474 RTBKIT-478

This replaces PR-147 (which I've closed)