Merging Release 0.9.15 from master to dev