Fixes #3687: Merge RTE framework into v1.7

Consists of patch spanning many revision numbers that are not listed