master-bc-912

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