Merge "Fix for broken build" into staging