KCINFR-1018: Committing SQL fixes