[BUGFIX] fillIn helper should take context into consideration
Merge pull request #5352 from teddyzeenny/fix-fillin

[BUGFIX] fillIn helper should take context into consideration