CNS-556: Editing a Calendar Assignment for a second time is not working