Merge "Add clear dependency on libRS_internal" into main