master-bc-2912

https://issues.liferay.com/browse/LIFERAYQA-11958