master-bc-2954

https://issues.liferay.com/browse/LIFERAYQA-11784
https://issues.liferay.com/browse/LIFERAYQA-12116