master-rs-134

https://issues.liferay.com/browse/LIFERAYQA-6858