master-bc-1332

https://issues.liferay.com/browse/LIFERAYQA-8040
https://issues.liferay.com/browse/LIFERAYQA-8011