Allow not to specify FROM
Merge branch 'develop'