RTBKIT-504 

Ready to merge