master-bc-2063

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