master-bc-5

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