WIP : Inplace edit
Merge remote-tracking branch 'kalkov/develop' into develop