master-bc-1404

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