Issue #174: Allign samples with SQLEP 1.7.5