Adding changing to snapshot
Merge branch 'topic/changing' into develop