master-bc-1623

https://issues.liferay.com/browse/LIFERAYQA-5336
https://issues.liferay.com/browse/LIFERAYQA-8754