Merge "[1/n] Compat UI status flag creation" into main