More merging from feature/restrictuser