Merge "Support for decorated identity prefix" into sc-dev