master-bc-1513

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