With this commit I've made the following progress:
           # HOT-1 Fixed