MPS-19586 Use stripImplementation in Build Scripts
Merge branch '3.1/rcp'
make