[TIMOB-15017] Bug fixes
[TIMOB-15017] More bug fixes
[TIMOB-15017] More bug fixes
[TIMOB-15017] Last batch of bug fixes