master-bc-1805

https://issues.liferay.com/browse/LIFERAYQA-3796
https://issues.liferay.com/browse/LIFERAYQA-9368
https://issues.liferay.com/browse/LIFERAYQA-9423