Merge remote-tracking branch 'remotes/ArtForz/reverseFlags' into Dev

many merge conflicts surrounding the use of id vs UUID - this commit
does not compile.