Merge commit '3fac5808f36c8da8785566175925b6ff396dd59f' into develop
Merge remote-tracking branch 'origin/master' into develop
[BUGFIX] UserFormHandler's container has to be protected instead of private