[12768] Initial work for unitFlags2