master-bc-1364

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