PMO-2375: fix build
PMO-2401: re-using base claim of former period when merging claims