Merge request for all previous patch i maid

Merge request for all previous patch i maid