Merged feature/HOT-42 + fixes