Merge pull request #17243 from cotequeiroz/rcssmin