Issue #SQLEP 1.8.0 alignment