Merge "BUG-1953: fix SAL compatility layer"