master-bc-1402

https://issues.liferay.com/browse/LIFERAYQA-8204
https://issues.liferay.com/browse/LIFERAYQA-7918