master-bc-1667

https://issues.liferay.com/browse/LIFERAYQA-8877
https://issues.liferay.com/browse/LIFERAYQA-8932