Merge commit '305b07680f' into orion/master