merge for drawable object
drawable object fixes
merge