Merge remote-tracking branch 'sneha/2473' into develop

This closes #61