master-bc-1723

https://issues.liferay.com/browse/LIFERAYQA-9092
https://issues.liferay.com/browse/LIFERAYQA-9123