master-bc-1241

https://issues.liferay.com/browse/LIFERAYQA-7832
https://issues.liferay.com/browse/LIFERAYQA-7779
https://issues.liferay.com/browse/LIFERAYQA-7779