master-bc-993

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