153 upmerge plus minor interface restoration