master-bc-789

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