Patch v.4.0.1 - RWD improvements