master-bc-1969

https://issues.liferay.com/browse/LIFERAYQA-9844
https://issues.liferay.com/browse/LIFERAYQA-9840