Merge branch 'acked' into davinci-reset