Merge pull request #1310 from rzhxeo/rtlnow