Merge "Use uint32_t for input source"