OOIION-1482 and OOIION-1490
Merge pull request #96 from rajvikram/fix_1482_1490_rebase

OOIION-1482 and OOIION-1490