Incomplete work to fix calculated role sync issue