master-bc-1345

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