master-bc-1552

https://issues.liferay.com/browse/LIFERAYQA-8534
https://issues.liferay.com/browse/LIFERAYQA-8623