master-bc-1380

https://issues.liferay.com/browse/LIFERAYQA-7980
https://issues.liferay.com/browse/LIFERAYQA-8114