Merge remote-tracking branch 'oblomov/me_cmd'