fixes #526 - merge FB. Decided to keep web logic for runtime backward
compatibility