Re #7240 Fix import issue and API v1 code
Merge branch 'feature/7240_cleanup_refm' into develop