Merge branch 'hassaanaliw-cracked'