Merge remote-tracking branch 'origin/dev'
Merge commit '5631f63f0743115cdc058fa9bf7106ce7370d5ec'
Merge commit '7fd9421f829f4d043ed10b3443be302d390696a1'
Change copyright and date
Merge remote-tracking branch 'origin/dev' into dev