Build 42 compatibility update
