M5/master merge

Merge with few changes