Merge craft-loggin changes