Merge commit 'ser_mysql/master' into mysql