Merge "Use correct type when reading SCR register" into integration