Merge "Align generateNsFilterLocked() with comment as temporary fix" into main