Merge "Fixed and suppressed some thumb.php IDEA errors"