Merge branch 'dev'
handle warning in before_gemstone.st