Changes for RT 3.8.1