master-bc-2452

https://issues.liferay.com/browse/LIFERAYQA-10969
https://issues.liferay.com/browse/LIFERAYQA-11120