master-bc-1392

https://issues.liferay.com/browse/LIFERAYQA-8185
https://issues.liferay.com/browse/LIFERAYQA-3837