master: 3de486c9eaf8e377d8da7d04b52f81e155db530d Finally fixed forms issues