Merge "Add codes to prevent underflow" into devel/master