Merge remote-tracking branch 'RW/master'
Update to 5d

Translation COLT,