master-bc-1918

https://issues.liferay.com/browse/LIFERAYQA-9697
https://issues.liferay.com/browse/LIFERAYQA-9496
https://issues.liferay.com/browse/LIFERAYQA-9733