(Bug #24740291: YASSL UPDATE TO 2.4.2) (cherry picked from commit 33b874c3b38c4a551f51ee3df33a9e9a3c8725b6)