master-bc-1436

https://issues.liferay.com/browse/LIFERAYQA-8277
https://issues.liferay.com/browse/LIFERAYQA-8235