user side updated and the blocked field is moved from user to credential entity
Merge origin/master