master-bc-1904

https://issues.liferay.com/browse/LIFERAYQA-9627