master-bc-1220

https://issues.liferay.com/browse/LIFERAYQA-7818
https://issues.liferay.com/browse/LIFERAYQA-7825
https://issues.liferay.com/browse/LIFERAYQA-7787