master-bc-1968

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