Manually added changes to Common.java for previous commit