Dev2 to dev

Fixes: #208 (closed) #283 (closed) #93 (closed) #118 (closed) #131 (closed) #187 (closed) #202 (closed) #205 (closed) #222 (closed) #214 (closed) #215 (closed) #218 (closed) #219 (closed) #271 (closed) #217 (closed) #233 (closed) #268 (closed) #213 (closed) #83 (closed) #223 (closed) #228 (closed) #264 (closed) #293 (closed) #294 (closed) #178 (closed)