master-bc-1235

https://issues.liferay.com/browse/LIFERAYQA-7292
https://issues.liferay.com/browse/LIFERAYQA-7923
https://issues.liferay.com/browse/LIFERAYQA-7782