master-bc-1724

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