fine tune show user field control
Redundant code
failed to delete some code in 9056affc9a0d04cf6f43ff0fc29551a6bfaa0583
Merge remote-tracking branch 'origin/master' into 1.4.6