Merge stable features included in this update to master

I am merging the features included as of now in this update.