'sync' should merge from the production branch
Version 0.3.3.1