* Branch parity master -> canary#604

PWagner1 merged 4 commits into

canaryKrypton-Suite/Extended-Toolkit:canaryfrom

masterKrypton-Suite/Extended-Toolkit:masterCopy head branch name to clipboard