Merge commit '8059467' into m-wireless-dev