master-bc-1177

https://issues.liferay.com/browse/LIFERAYQA-7536
https://issues.liferay.com/browse/LIFERAYQA-7610