Rebase FUW branch from Develop

[rija]

integrate all changes that have landed in develop since last rebase

• [x] from e6a37fa12b48756e95f4d79894593f2775501282
• [x] from 07f5923cf99013735101d26aaba2ecddfdb795f5
• [x] from 3954c0b0af9f698afcb06b64c94d0fc8968c5cdb
• [x] from f1f0ec0b8a4d511bad4936ea44fa7d5c2ed290ee
• [x] from 5377e2c4524d5d39e3a2d740ca94096f7dae01f9
• [x] from c398c83395a90ab68165edaec54ee338809e0421
• [x] from 747cc16c8194e863d5f5da1ebbd7dffcb9cd932c
• [x] from ed1cfe421dca20c51239c186934ed1f2b0e02d4e
• [x] from d24c8641347822e75505b3d91348c3d3ddb800b4
• [x] from e15f461954dae1b286cca9daebf96ad94b10a9a5
• [x] from 71bc6548295df97ed51b65ec34d46e2018ba2e14
• [x] from 2ff800d6686cb790bf13b0dc80341dbfe9fd56aa
• [x] from 05f7b80d8fab9743608078f6008a966c737a357f
• [x] from 201d1ba1a384ec3600ff6b87c98b915450fc1677
• [x] from 54ec00cc1a54b9665f44ad94ea1242bbbeb45530
• [x] from d3dcb13e6c1858102286bba9cb2a7a0116ce25a2
• [x] from 1e977fb3881ce12065ad6f71c18f091df82450df
• [x] from cf1536966e69b3b6f40048fac0e3f054dd7388c6
• [x] from 32f2a7dc6b5f95dcf29092f1ad4e9a1989fb3665
• [x] from eb155b21319e5c8ff21affa944a3a977567c17d2
• [x] from 08f92d8fe8583a9e7db12d392c07e14a243da5c8
• [x] from 341c70670ac2ab3f03514b3eab3f5f2d6a46a951
• [x] from 72c480f22cdab5adf51241dd19125929bb846012
• [x] from 457401405e7a6c693d10225846b12098a0511d2d
• [x] from 38334b466088db3d9ef32e1eaa031297c003687b
• [x] from 0d4a025e37f02d71182296859a12103f1b14894d
• [x] from 82364a86158dcb6edadae5dcd891ec1fbabe5c45
• [x] from 2958fac67ac00f5b72f8266051d1fddb33550979
• [x] from 45f7cc500093020c16af5bd4b61a11d0d5d963e8
• [x] from b3d2f3c1a147f1f6fcbf844fd5082ff84541f770
• [x] from 6198c11c8288903036590ec429f6ace970505d6a