master-bc-1357

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