added: missing dependency of LightXu's previous change
Merge branch 'master' into local-testing