fixed issue with setting the source after expanding to the lowest
feature instance.
Merge remote-tracking branch 'origin/develop' into develop