Squashed few necessary commits (see below)