Merged latest code and passed compilation