Merge "fix odl sulfur aaa artifact"