Merge master to motion branch