BK-1196 - Implement multiple save options
Merge branch 'BK1196' into 2.0
Fixing conflict on merge branch