Patch v.3.6.1 - RWD improvements