distribution continues
Merge branch 'dev' into dist
distribution continues
distribution continues
misc
fixing conflict dist and dev