master-bc-1614

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