Initial Commit

Porting v1.23 from Bitbucket