master-bc-1865

https://issues.liferay.com/browse/LIFERAYQA-8966
https://issues.liferay.com/browse/LIFERAYQA-9554