412.09 merge dev branch (425.01) - Updated status codes