master-bc-1868

https://issues.liferay.com/browse/LIFERAYQA-3680
https://issues.liferay.com/browse/LIFERAYQA-9552
https://issues.liferay.com/browse/LIFERAYQA-9582