Reverted wrong merges from prototype branch