[#DISCAPP-22: New Add Rule button]
#master: merge with without-js branch