master-bc-2018

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