Merge branch 'feat/1742-apilog' into develop
Merge branch 'feat/1751-fieldtrip' into develop
Merge branch 'feat/1751-fieldtrip' into develop
Re #1751 Removed redundant isShownAt
Merge remote-tracking branch 'origin/develop' into test