Credentials update doesn't make sense here
Merge branch 'abstractj-refactor'