[sd2_mr0663] Sunwell Plateau changes after last sd2 commits. Also cleanup SQL