master-en-56

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