OE-3321 - Fixed showing site and firm dialog on page load
Merge branch 'release/1.4' into develop