Merge feature branch into develop branch

Pretty please.