master-bc-3122

https://issues.liferay.com/browse/LIFERAYQA-12410
https://issues.liferay.com/browse/LIFERAYQA-11956