Merged project with latest state of original polka project