Merge "Make toInt() a little bit shorter by moving std::underlying_type to a template argument" into pi-dev