Merge "Use to-upper function instead of $(shell tr)"