Updated MSF to create constant nodes for non-literals
Merge remote-tracking branch 'origin/dev' into dev