Custom fallbak view
Merge branch 'enhancement-#2' into develop