Merge branch 'rt_cong_ctrl'