master-bc-1416

https://issues.liferay.com/browse/LIFERAYQA-8168
https://issues.liferay.com/browse/LIFERAYQA-8157