Merge branch 'scoop-develop'

Signed-off-by: Jeremy Ho <jujaga@gmail.com>