Merging v0.15.0 with Raj’s changes
Merge branch 'master' into v0.15.0_update