Merge "Update for increased SW input codes."