Merge remote-tracking branch 'ampshark/rddtable' into rddtable