Merge from mobile product code for backward compatibility