Fixed lots of problems with RD_Edit in 15-1-Dev  This file only applies to 15-1dev