Last commit before 3.6.7

Signed-off-by: KDGDev <kirill.desirehd@gmail.com>