Root commit to solve baseurl problems