Reverted changes during 1.0.9* release
Packaging
Merge branch 'feature/restore-elproto-remove-issues' into develop