Merge remote-tracking branch 'mmue/fix-rtlnow'