Merge "Add credential management app to platform"