Decode user data when modifying instance attribute - EUCA-8695

EUCA-8695
Merge remote-tracking branch 'origin/dev/sjones/EUCA-8695' into testing