recompiled merge from sitata/drawing