master-bc-1715

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