MT#9177 Add credentials as device fields logic