master-bc-1712

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