Refs #8760. Fix the problem with imports
Merge branch 'feature/8760_enginx_calibrate' into develop