Merging v0.15.0 with Raj’s changes