master-bc-3166

https://issues.liferay.com/browse/LIFERAYQA-12484
https://issues.liferay.com/browse/LIFERAYQA-12521