LPS-42484 userId of TemplateContext was not being affect by the changes
LPS-42526
Merge branch 'master' of github.com:liferay/liferay-plugins