#1: Rebased from Artur's branch
#2 заработал грид