Merge "[RN] Fixing the notes generation issue"