[ALOY-800b] fixes for PR338