[V1S4 US27] : Fix for null Creator.
Merge remote-tracking branch 'origin/master'