master-bc-3101

https://issues.liferay.com/browse/LIFERAYQA-12378
https://issues.liferay.com/browse/LIFERAYQA-12371
https://issues.liferay.com/browse/LIFERAYQA-12401