master-bc-2011

https://issues.liferay.com/browse/LIFERAYQA-9883
https://issues.liferay.com/browse/LIFERAYQA-9684