Production release for #311, #376, #378 & #384

* #311 
* #376 
* #378 
* #384