Merge "Remove noise both vertical and horizontal" into feature/zuulv3