master-bc-1353

https://issues.liferay.com/browse/LIFERAYQA-8046
https://issues.liferay.com/browse/LIFERAYQA-8061