1.6.4-v1.0.1 original commit

Signed-off-by: Poenjabiesous <nielverster@gmail.com>