Related to #3025 (closed) and #811 (closed), it merges !393 (merged), !389 (merged) and !395 (merged)