Merge "Forbid granting access to NLSes with too-long component names" into rvc-dev