master-bc-914

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