Update dev branch with flans master changes.