[SD-945] Improvements and missing files
Merge remote-tracking branch 'siva/master'