First drap version for model
Merge branch 'develop' into ALIEN-445