Tagging 2.3.5 with fix for width/height