[BISERVER-10594] - Merge the data-access's sandbox branch code into

master