Sync up with commit 04a375803b2b9601d9912d6f0bd84f62a062a5a1 of the base - added dummy loading