[#56226898] improving cucumber step