Moved to Lapidary
Merge branch 'release/move-to-lapidary' into develop