This is preparatory step for multiRU. Please see individual patches for details.

/cc @jhuge, @lu.xu, @xavier_thompson, @Daetalus