Merge "Fix incorrect seperator while concatenating shortcuts" into sc-dev