Merge "Fixed some miscellaneous codes" into devel