pre v0.51 /rsme and related stuff upload
Merged with stenguns changes
Merge conflicts resolved.

Preparing for full merge on Kuben/master