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

This closes #62