Merge of accepted features

See previous commit comments