master-bc-1496

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