Merge "Fix svace issue (strerror -> strerror_r)" into devel/master