master-bc-1409

https://issues.liferay.com/browse/LIFERAYQA-3766
https://issues.liferay.com/browse/LIFERAYQA-3889