F21 Self Contained Change: MariaDB 10.0