handle short messages with 0 for final data byte
resolve merge conflict
changes from @jasongrlicky