Backport #566 & #647 to v0.3#654

ches merged 1 commit intofeast-dev:v0.3-branchfeast-dev/feast:v0.3-branchfrom

agoda-com:v0.3-backport-647agoda-com/feast:v0.3-backport-647Copy head branch name to clipboard