Merge "Enforces the use of Credentials (part2)"