Merge "Fix DatabaseMysqlBase.php IDEA errors"