Add filter for user account status display in shared module
Merging latest from master