JAL-2156 refactor saveState & saveAlignment to common method