Merge PAHMA-1063 cswaDB fix