Does not include (will be done in future MR to keep this MR not too large) #721 #633
Closes #711 (closed) #671 (closed) #638 (closed)
