master-bc-1053

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