Merge branch 'isnan' into testing
Merge branch 'StopRtdsAdapter' into testing
Merge branch 'rtdsbug' into testing