Issue #175: Allign samples with SQLEP 1.7.5