Merge "fix compatibility problem with reclass 1.4.1"