updated to kotlin m7
Merge branch 'release/test'