BZ-9741 adding sandbox functionality