[TIMOB-13118] Bug fixes
[TIMOB-13118] Finished the source map infrastructure