master-bc-1109

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